From 015db265a8b80218b2206ac54c1e0653c59fcd13 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Mon, 23 Aug 2004 09:33:56 +0000 Subject: [PATCH] bitkeeper revision 1.1159.49.2 (4129ba04dWgj04wi8WVrXsPfcAsSQA) Fix ebtables patch for 2.4.27 --- Makefile | 9 ++- .../arch/xen/defconfig-xen0 | 78 ++++++++----------- 2 files changed, 38 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index 6722b9c6e0..dace27825d 100644 --- a/Makefile +++ b/Makefile @@ -45,16 +45,17 @@ ifeq ($(LINUX_SRC),) LINUX_SRC := ./linux-$(LINUX_VER).tar.bz2 endif -patches/ebtables-brnf-5_vs_2.4.25.diff: +patches/ebtables.diff: mkdir -p patches - wget $(SOURCEFORGE_MIRROR)/ebtables/ebtables-brnf-5_vs_2.4.25.diff.gz \ + #wget $(SOURCEFORGE_MIRROR)/ebtables/ebtables-brnf-5_vs_2.4.25.diff.gz \ -O- | gunzip -c > $@ + wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@ LINUX_TREES := linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU # make a linux-xen build tree from a pristine kernel plus sparse tree ifeq ($(LINUX_RELEASE),2.4) -mk-linux-trees: patches/ebtables-brnf-5_vs_2.4.25.diff pristine-linux-src +mk-linux-trees: patches/ebtables.diff pristine-linux-src $(RM) -rf $(LINUX_TREES) echo $(LINUX_SRC) | grep -q bz2 && \ tar -jxf $(LINUX_SRC) || tar -zxf $(LINUX_SRC) @@ -63,7 +64,7 @@ mk-linux-trees: patches/ebtables-brnf-5_vs_2.4.25.diff pristine-linux-src ./mkbuildtree ../linux-$(LINUX_VER)-xen0 ) cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU ( cd linux-$(LINUX_VER)-xen0 ; \ - patch -p1 -F3 < ../patches/ebtables-brnf-5_vs_2.4.25.diff ) + patch -p1 -F3 < ../patches/ebtables.diff ) else mk-linux-trees: pristine-linux-src $(RM) -rf $(LINUX_TREES) diff --git a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 index 12aee9779f..1f0dcfc70d 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_XEN=y CONFIG_X86=y @@ -160,11 +160,11 @@ CONFIG_IP_PNP_DHCP=y # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=y -CONFIG_IP_NF_FTP=y +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m # CONFIG_IP_NF_AMANDA is not set -CONFIG_IP_NF_TFTP=y -CONFIG_IP_NF_IRC=y +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_IRC=m # CONFIG_IP_NF_QUEUE is not set CONFIG_IP_NF_IPTABLES=y # CONFIG_IP_NF_MATCH_LIMIT is not set @@ -181,22 +181,23 @@ CONFIG_IP_NF_IPTABLES=y # CONFIG_IP_NF_MATCH_TTL is not set # CONFIG_IP_NF_MATCH_TCPMSS is not set # CONFIG_IP_NF_MATCH_HELPER is not set -CONFIG_IP_NF_MATCH_STATE=y -CONFIG_IP_NF_MATCH_CONNTRACK=y +CONFIG_IP_NF_MATCH_STATE=m +CONFIG_IP_NF_MATCH_CONNTRACK=m # CONFIG_IP_NF_MATCH_UNCLEAN is not set # CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_MATCH_PHYSDEV=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y # CONFIG_IP_NF_TARGET_MIRROR is not set -CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_NAT=m CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m # CONFIG_IP_NF_NAT_LOCAL is not set # CONFIG_IP_NF_NAT_SNMP_BASIC is not set -CONFIG_IP_NF_NAT_IRC=y -CONFIG_IP_NF_NAT_FTP=y -CONFIG_IP_NF_NAT_TFTP=y +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m # CONFIG_IP_NF_MANGLE is not set CONFIG_IP_NF_TARGET_LOG=y CONFIG_IP_NF_TARGET_ULOG=y @@ -216,10 +217,6 @@ CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -229,6 +226,25 @@ CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_DEV_APPLETALK is not set # CONFIG_DECNET is not set CONFIG_BRIDGE=y +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_IPF=m +CONFIG_BRIDGE_EBT_ARPF=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_VLANF=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_MARKF=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_MARK_T=m # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_LLC is not set @@ -257,10 +273,6 @@ CONFIG_IDE=y # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y @@ -272,10 +284,6 @@ CONFIG_BLK_DEV_IDETAPE=y CONFIG_BLK_DEV_IDEFLOPPY=y CONFIG_BLK_DEV_IDESCSI=y CONFIG_IDE_TASK_IOCTL=y - -# -# IDE chipset support/bugfixes -# CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_CMD640_ENHANCED=y # CONFIG_BLK_DEV_ISAPNP is not set @@ -319,10 +327,6 @@ CONFIG_BLK_DEV_SLC90E66=y CONFIG_BLK_DEV_TRM290=y CONFIG_BLK_DEV_VIA82CXXX=y CONFIG_IDE_CHIPSETS=y - -# -# Note: most of these also require special kernel boot parameters -# # CONFIG_BLK_DEV_4DRIVES is not set # CONFIG_BLK_DEV_ALI14XX is not set # CONFIG_BLK_DEV_DTC2278 is not set @@ -344,20 +348,12 @@ CONFIG_BLK_DEV_PDC202XX=y # SCSI support # CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set CONFIG_CHR_DEV_SG=y - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_DEBUG_QUEUES is not set # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set @@ -644,14 +640,6 @@ CONFIG_PSMOUSE=y # Joysticks # # CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# # CONFIG_QIC02_TAPE is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_PANIC_EVENT is not set -- 2.30.2